Some `rustc_query_system` cleanups by nnethercote · Pull Request #152023 · rust-lang/rust

nnethercote · 2026-02-03T02:16:23Z

Small improvements I found while looking closely at rustc_query_system. Best reviewed one commit at a time.

r? @cjgillot

compiler/rustc_middle/src/query/values.rs

compiler/rustc_query_system/src/cache.rs

cjgillot · 2026-02-03T09:35:43Z

r=me with Zoxc's comment resolved

compiler/rustc_query_system/messages.ftl

nnethercote · 2026-02-03T23:56:37Z

I rebased over #152041, and added a new commit to move rustc_middle::values to rustc_middle::query::values.

nnethercote · 2026-02-03T23:57:03Z

@bors r=cjgillot

rust-bors · 2026-02-03T23:57:06Z

📌 Commit 461e5ab has been approved by cjgillot

It is now in the queue for this repository.

…uwer Rollup of 5 pull requests Successful merges: - #151893 (Move the query list into a new `rustc_middle::queries` module) - #152060 (ci: Optimize loongarch64-linux dist builders) - #151993 (Add uv to the list of possible python runners) - #152047 (Convert to inline diagnostics in `rustc_interface`) - #152053 (Avoid semicolon suggestion when tail expr is error) Failed merges: - #152023 (Some `rustc_query_system` cleanups)

@cjgillot

Some `rustc_query_system` cleanups Small improvements I found while looking closely at `rustc_query_system`. Best reviewed one commit at a time. r? @cjgillot

@cjgillot

Some `rustc_query_system` cleanups Small improvements I found while looking closely at `rustc_query_system`. Best reviewed one commit at a time. r? @cjgillot

It's a tiny module with one trait and a default impl. It's not used in `rustc_query_system`; all uses and non-default impls are in `rustc_middle` and `rustc_query_impl`. This commit moves it into `rustc_middle`, which makes things simpler overall.

It's a better place for it, because it relates to queries.

They are defined in `rustc_query_system` but used in `rustc_query_impl`. This is very much *not* how things are supposed to be done; I suspect someone got lazy and took a shortcut at some point. This commit moves the errors into `rustc_query_impl`. This requires more lines of code to give `rustc_query_impl` an errors module, but it's worthwhile to do things in the normal way instead of a weird exceptional way.

It's unused. And it's nice to remove this function that didn't behave like normal `clear` does, as the comment explained.

rustbot · 2026-02-04T22:30:43Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

nnethercote · 2026-02-04T22:31:22Z

I rebased.

@bors r+ rollup

rust-bors · 2026-02-04T22:31:25Z

📌 Commit 0420a2e has been approved by nnethercote

It is now in the queue for this repository.

@cjgillot

Some `rustc_query_system` cleanups Small improvements I found while looking closely at `rustc_query_system`. Best reviewed one commit at a time. r? @cjgillot

Rollup of 15 pull requests Successful merges: - #151431 (Add new unstable attribute: `#[export_visibility = ...]`.) - #146900 (Add avr_target_feature) - #152033 (Rename trait `DepNodeParams` to `DepNodeKey`) - #152142 (Convert to inline diagnostics in `rustc_hir_typeck`) - #152020 (Remove dummy loads on offload codegen) - #152023 (Some `rustc_query_system` cleanups) - #152068 (Convert to inline diagnostics in `rustc_resolve`) - #152081 (Port depgraph testing attributes to parser) - #152090 (Port reexport_test_harness_main to attr parser) - #152105 (Convert to inline diagnostics in `rustc_ast_lowering`) - #152108 (Convert to inline diagnostics in `rustc_expand`) - #152114 (Convert to inline diagnostics in `rustc_mir_transform`) - #152115 (Convert to inline diagnostics in `rustc_metadata`) - #152116 (Remove rustdoc GUI flaky test) - #152128 (Adopt matches-logical-or-141497.rs to LLVM HEAD) Failed merges: - #152070 (Convert to inline diagnostics in `rustc_pattern_analysis`) - #152106 (Convert to inline diagnostics in `rustc_ast_passes`) - #152109 (Convert to inline diagnostics in `rustc_errors`) - #152117 (Convert to inline diagnostics in `rustc_trait_selection`) - #152118 (Convert to inline diagnostics in `rustc_codegen_ssa`) - #152119 (Convert to inline diagnostics in `rustc_middle`) - #152126 (Convert to inline diagnostics in `rustc_mir_build`) - #152131 (Port rustc_no_implicit_bounds attribute to parser.)

@cjgillot

Some `rustc_query_system` cleanups Small improvements I found while looking closely at `rustc_query_system`. Best reviewed one commit at a time. r? @cjgillot

@cjgillot

Some `rustc_query_system` cleanups Small improvements I found while looking closely at `rustc_query_system`. Best reviewed one commit at a time. r? @cjgillot

Rollup of 19 pull requests Successful merges: - #146900 (Add avr_target_feature) - #150379 (Return `ExitCode` from `rustc_driver::main` instead of calling `process::exit`) - #152033 (Rename trait `DepNodeParams` to `DepNodeKey`) - #152142 (Convert to inline diagnostics in `rustc_hir_typeck`) - #152145 (Disable flaky test `oneshot::recv_timeout_before_send`) - #152020 (Remove dummy loads on offload codegen) - #152023 (Some `rustc_query_system` cleanups) - #152068 (Convert to inline diagnostics in `rustc_resolve`) - #152081 (Port depgraph testing attributes to parser) - #152090 (Port reexport_test_harness_main to attr parser) - #152105 (Convert to inline diagnostics in `rustc_ast_lowering`) - #152108 (Convert to inline diagnostics in `rustc_expand`) - #152110 (Fix incorrect RSS on systems with non-4K page size) - #152111 (bootstrap: exclude hexagon-unknown-qurt from llvm-libunwind default) - #152114 (Convert to inline diagnostics in `rustc_mir_transform`) - #152115 (Convert to inline diagnostics in `rustc_metadata`) - #152116 (Remove rustdoc GUI flaky test) - #152118 (Convert to inline diagnostics in `rustc_codegen_ssa`) - #152128 (Adopt matches-logical-or-141497.rs to LLVM HEAD) Failed merges: - #152070 (Convert to inline diagnostics in `rustc_pattern_analysis`) - #152106 (Convert to inline diagnostics in `rustc_ast_passes`) - #152109 (Convert to inline diagnostics in `rustc_errors`) - #152117 (Convert to inline diagnostics in `rustc_trait_selection`) - #152119 (Convert to inline diagnostics in `rustc_middle`) - #152126 (Convert to inline diagnostics in `rustc_mir_build`) - #152131 (Port rustc_no_implicit_bounds attribute to parser.)

…uwer Rollup of 18 pull requests Successful merges: - #150379 (Return `ExitCode` from `rustc_driver::main` instead of calling `process::exit`) - #152033 (Rename trait `DepNodeParams` to `DepNodeKey`) - #152142 (Convert to inline diagnostics in `rustc_hir_typeck`) - #152145 (Disable flaky test `oneshot::recv_timeout_before_send`) - #152020 (Remove dummy loads on offload codegen) - #152023 (Some `rustc_query_system` cleanups) - #152068 (Convert to inline diagnostics in `rustc_resolve`) - #152081 (Port depgraph testing attributes to parser) - #152090 (Port reexport_test_harness_main to attr parser) - #152105 (Convert to inline diagnostics in `rustc_ast_lowering`) - #152108 (Convert to inline diagnostics in `rustc_expand`) - #152110 (Fix incorrect RSS on systems with non-4K page size) - #152111 (bootstrap: exclude hexagon-unknown-qurt from llvm-libunwind default) - #152114 (Convert to inline diagnostics in `rustc_mir_transform`) - #152115 (Convert to inline diagnostics in `rustc_metadata`) - #152116 (Remove rustdoc GUI flaky test) - #152118 (Convert to inline diagnostics in `rustc_codegen_ssa`) - #152128 (Adopt matches-logical-or-141497.rs to LLVM HEAD) Failed merges: - #152070 (Convert to inline diagnostics in `rustc_pattern_analysis`) - #152106 (Convert to inline diagnostics in `rustc_ast_passes`) - #152109 (Convert to inline diagnostics in `rustc_errors`) - #152117 (Convert to inline diagnostics in `rustc_trait_selection`) - #152119 (Convert to inline diagnostics in `rustc_middle`) - #152126 (Convert to inline diagnostics in `rustc_mir_build`) - #152131 (Port rustc_no_implicit_bounds attribute to parser.)

@cjgillot

Rollup merge of #152023 - nnethercote:rm-Value, r=nnethercote Some `rustc_query_system` cleanups Small improvements I found while looking closely at `rustc_query_system`. Best reviewed one commit at a time. r? @cjgillot

rustbot assigned cjgillot Feb 3, 2026

Zoxc reviewed Feb 3, 2026

View reviewed changes

compiler/rustc_middle/src/query/values.rs Show resolved Hide resolved

This comment has been minimized.

Sign in to view

Zalathar reviewed Feb 3, 2026

View reviewed changes

compiler/rustc_query_system/src/cache.rs Show resolved Hide resolved

petrochenkov reviewed Feb 3, 2026

View reviewed changes

compiler/rustc_query_system/messages.ftl Outdated Show resolved Hide resolved

nnethercote force-pushed the rm-Value branch from 32c8986 to 461e5ab Compare February 3, 2026 23:56

This comment has been minimized.

Sign in to view

rust-bors bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 3, 2026

This comment has been minimized.

Sign in to view

This was referenced Feb 4, 2026

Rollup of 3 pull requests #152087

Closed

Rollup of 5 pull requests #152089

Merged

JonathanBrouwer mentioned this pull request Feb 4, 2026

Rollup of 4 pull requests #152091

Closed

JonathanBrouwer mentioned this pull request Feb 4, 2026

Rollup of 9 pull requests #152093

Closed

rust-bors bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Feb 4, 2026

This comment has been minimized.

Sign in to view

rust-bors bot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 4, 2026

nnethercote added 3 commits February 5, 2026 08:15

Move rustc_middle::values module to rustc_middle::query::values.

7bcb7a2

It's a better place for it, because it relates to queries.

Remove Cache::clear.

0420a2e

It's unused. And it's nice to remove this function that didn't behave like normal `clear` does, as the comment explained.

nnethercote force-pushed the rm-Value branch from 461e5ab to 0420a2e Compare February 4, 2026 22:30

rust-bors bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 4, 2026

Zalathar mentioned this pull request Feb 5, 2026

Rollup of 15 pull requests #152144

Closed

Zalathar mentioned this pull request Feb 5, 2026

Rollup of 18 pull requests #152147

Closed

Zalathar mentioned this pull request Feb 5, 2026

Rollup of 19 pull requests #152149

Closed

JonathanBrouwer mentioned this pull request Feb 5, 2026

Rollup of 18 pull requests #152156

Merged

rust-bors bot merged commit cf2ea13 into rust-lang:main Feb 5, 2026
11 checks passed

rustbot added this to the 1.95.0 milestone Feb 5, 2026

nnethercote deleted the rm-Value branch February 5, 2026 22:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Some `rustc_query_system` cleanups#152023

Some `rustc_query_system` cleanups#152023
rust-bors[bot] merged 4 commits intorust-lang:mainfrom
nnethercote:rm-Value

nnethercote commented Feb 3, 2026

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

cjgillot commented Feb 3, 2026

Uh oh!

Uh oh!

This comment has been minimized.

nnethercote commented Feb 3, 2026

Uh oh!

nnethercote commented Feb 3, 2026

Uh oh!

rust-bors bot commented Feb 3, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rustbot commented Feb 4, 2026

Uh oh!

nnethercote commented Feb 4, 2026

Uh oh!

rust-bors bot commented Feb 4, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Conversation

nnethercote commented Feb 3, 2026

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

cjgillot commented Feb 3, 2026

Uh oh!

Uh oh!

This comment has been minimized.

nnethercote commented Feb 3, 2026

Uh oh!

nnethercote commented Feb 3, 2026

Uh oh!

rust-bors bot commented Feb 3, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rustbot commented Feb 4, 2026

Uh oh!

nnethercote commented Feb 4, 2026

Uh oh!

rust-bors bot commented Feb 4, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants